Autogenerated HTML docs for v1.6.3-rc0-53-g1a1f0
diff --git a/git-branch.html b/git-branch.html index ec87176..b132aff 100644 --- a/git-branch.html +++ b/git-branch.html
@@ -488,24 +488,26 @@ </dt> <dd> <p> - When creating a new branch, set up the configuration so that <em>git-pull</em> - will automatically retrieve data from the start point, which must be - a branch. Use this if you always pull from the same upstream branch - into the new branch, and if you do not want to use "git pull - <repository> <refspec>" explicitly. This behavior is the default - when the start point is a remote branch. Set the - branch.autosetupmerge configuration variable to <tt>false</tt> if you want - <em>git-checkout</em> and <em>git-branch</em> to always behave as if <em>--no-track</em> were - given. Set it to <tt>always</tt> if you want this behavior when the - start-point is either a local or remote branch. + When creating a new branch, set up configuration to mark the + start-point branch as "upstream" from the new branch. This + configuration will tell git to show the relationship between the + two branches in <tt>git status</tt> and <tt>git branch -v</tt>. Furthermore, + it directs <tt>git pull</tt> without arguments to pull from the + upstream when the new branch is checked out. </p> +<div class="para"><p>This behavior is the default when the start point is a remote branch. +Set the branch.autosetupmerge configuration variable to <tt>false</tt> if you +want <tt>git checkout</tt> and <tt>git branch</tt> to always behave as if <em>--no-track</em> +were given. Set it to <tt>always</tt> if you want this behavior when the +start-point is either a local or remote branch.</p></div> </dd> <dt> --no-track </dt> <dd> <p> - Ignore the branch.autosetupmerge configuration variable. + Do not set up "upstream" configuration, even if the + branch.autosetupmerge configuration variable is true. </p> </dd> <dt> @@ -667,7 +669,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-04-13 02:39:28 UTC +Last updated 2009-04-18 06:17:30 UTC </div> </div> </body>
